Make the upward merge for non-stable packaging more obvious#18607
Open
NattyNarwhal wants to merge 3 commits intophp:masterfrom
Open
Make the upward merge for non-stable packaging more obvious#18607NattyNarwhal wants to merge 3 commits intophp:masterfrom
NattyNarwhal wants to merge 3 commits intophp:masterfrom
Conversation
NattyNarwhal
added
the
Category: Documentation
The notice to merge upward is easy to miss when pushing the other branches and the RC tag. Call attention to it with code blocks, and move the note on resolving merge conflicts from an upward merge into a note. Perhaps the upward merge merits its own step and thus a renumbering?
NattyNarwhal
force-pushed
the
improve-upward-merge-docs
branch
from
3cea695 to
8ddddb9
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The notice to merge upward is easy to miss when pushing the other branches and the RC tag. Call attention to it with code blocks, and move the note on resolving merge conflicts from an upward merge into a note.
Perhaps the upward merge merits its own step and thus a renumbering?